Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 24 Sep 2011 00:42:30 +0000 (17:42 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 24 Sep 2011 00:42:30 +0000 (17:42 -0700)

Trivial merge